From 420ed75d5496ad1c20e5af0acf04eed98b3138ac Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Thu, 2 Feb 2006 13:57:18 +0000 Subject: [PATCH] Fix and cleanup how we build i386/x86_64 swiotlb.o. Signed-off-by: Christian Limpach --- linux-2.6-xen-sparse/arch/i386/kernel/Makefile | 1 - linux-2.6-xen-sparse/arch/x86_64/kernel/Makefile | 2 -- linux-2.6-xen-sparse/lib/Makefile | 5 ++--- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/Makefile b/linux-2.6-xen-sparse/arch/i386/kernel/Makefile index 1914055a26..fba91de3c2 100644 --- a/linux-2.6-xen-sparse/arch/i386/kernel/Makefile +++ b/linux-2.6-xen-sparse/arch/i386/kernel/Makefile @@ -35,7 +35,6 @@ obj-$(CONFIG_HPET_TIMER) += time_hpet.o obj-$(CONFIG_EFI) += efi.o efi_stub.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_SMP_ALTERNATIVES) += smpalts.o -obj-$(CONFIG_SWIOTLB) += swiotlb.o EXTRA_AFLAGS := -traditional diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/Makefile b/linux-2.6-xen-sparse/arch/x86_64/kernel/Makefile index bc72d60ac7..804568d747 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/Makefile +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/Makefile @@ -51,8 +51,6 @@ msr-$(subst m,y,$(CONFIG_X86_MSR)) += ../../i386/kernel/msr.o ifdef CONFIG_XEN time-y += ../../i386/kernel/time-xen.o -obj-$(CONFIG_SWIOTLB) += swiotlb.o -swiotlb-$(CONFIG_SWIOTLB) := ../../i386/kernel/swiotlb.o pci-dma-y += ../../i386/kernel/pci-dma-xen.o microcode-$(subst m,y,$(CONFIG_MICROCODE)) := ../../i386/kernel/microcode-xen.o quirks-y := ../../i386/kernel/quirks-xen.o diff --git a/linux-2.6-xen-sparse/lib/Makefile b/linux-2.6-xen-sparse/lib/Makefile index cce2c4d08e..0db79f11f6 100644 --- a/linux-2.6-xen-sparse/lib/Makefile +++ b/linux-2.6-xen-sparse/lib/Makefile @@ -44,10 +44,9 @@ obj-$(CONFIG_TEXTSEARCH_KMP) += ts_kmp.o obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o -ifeq ($(CONFIG_IA64),y) -obj-$(CONFIG_SWIOTLB) += swiotlb.o -else ifneq ($(CONFIG_XEN),y) obj-$(CONFIG_SWIOTLB) += swiotlb.o +ifneq ($(CONFIG_IA64),y) +swiotlb-$(CONFIG_XEN) := ../arch/i386/kernel/swiotlb.o endif hostprogs-y := gen_crc32table -- 2.30.2